From 0ccf0087e41530516827abcb8ef5e54e36fe3c3a Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 28 Feb 2025 16:26:08 +0800 Subject: [PATCH] gui/tray: Do not generate JPEG images in async image response for macOS We are seeing libjpeg related crashes in our packaged version for macOS. Until we are able to resolve this in the packaging, do not generate JPEG-based images Signed-off-by: Claudio Cambra --- src/gui/tray/asyncimageresponse.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gui/tray/asyncimageresponse.cpp b/src/gui/tray/asyncimageresponse.cpp index fb1bf8159..89b1f049e 100644 --- a/src/gui/tray/asyncimageresponse.cpp +++ b/src/gui/tray/asyncimageresponse.cpp @@ -12,12 +12,13 @@ * for more details. */ +#include "asyncimageresponse.h" + #include #include #include -#include "asyncimageresponse.h" -#include "usermodel.h" +#include "accountmanager.h" AsyncImageResponse::AsyncImageResponse(const QString &id, const QSize &requestedSize) { @@ -135,6 +136,12 @@ void AsyncImageResponse::slotProcessNetworkReply() } else { processNextImage(); } +#ifdef Q_OS_MACOS + // NOTE: We are facing issues with JPEGs at the moment on macOS with our Qt 6.8.2-based release. + // Do not create previews for JPEGs to prevent crashing. + } else if (imageData.startsWith(QByteArrayLiteral("\xFF\xD8")) && imageData.endsWith(QByteArrayLiteral("\xFF\xD9"))) { + processNextImage(); +#endif } else { setImageAndEmitFinished(QImage::fromData(imageData)); } -- 2.30.2